企业版

and miscellaneous odds and ends